Skip to content

Conversation

@mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Jan 9, 2026

It looks like feature/sdrabenh/gcm_v12 is very out of date compared to develop. So, in this PR, I've done the merge. It is...a lot. I'll keep draft for now.

cc: @sdrabenh

mathomp4 and others added 30 commits January 22, 2024 14:04
…sion to resource file; add hooks for ad hoc chemical loss mechanism per tracer; update emissions under AMIP (only)
….13-gocart

Update components to match (or exceed) GEOSgcm v11.4.0, update CI
Enables Climatological Anthropogenic Emissions after 2019
Silence error messages in getChannel() and getWavelength(), and add header file in process library
Changed sulfate to sulfur in the long names for emission and loss terms that represent all 4 bins (including DMS, SO2, SO4, and MSA).
…rbonaceous emissions in UFS diagnostic PM calculations.
…to used the revised version with a corrected seasonal cycle
BrianCurtis-NOAA and others added 24 commits September 22, 2025 20:14
…ling' into feature/pcolarco/merge_chemistry

Merging chemistry coupling and new photolysis calculator
# Conflicts:
#	ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridCompMod.F90
#	ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
#	ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_instance_DU.rc
#	ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90
#	ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90
#	ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_instance_SS.rc
#	ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml
@mathomp4 mathomp4 added 0 diff The changes in this pull request have verified to be zero-diff with the target branch. Non 0-diff The changes in this pull request are non-zero-diff labels Jan 9, 2026
@mathomp4
Copy link
Member Author

Closing this for now as @acollow is doing v12-ish stuff on develop. We can revisit in the future

@mathomp4 mathomp4 closed this Jan 16, 2026
@mathomp4 mathomp4 deleted the feature/merge-develop-into-v12-2026Jan08 branch January 16, 2026 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch. Non 0-diff The changes in this pull request are non-zero-diff

Projects

None yet

Development

Successfully merging this pull request may close these issues.